Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mirror: Suit slot weapon consistency + visuals #247

Conversation

SimpleStation14
Copy link
Member

Mirror of PR #26152: Suit slot weapon consistency + visuals from space-wizards space-wizards/space-station-14

6c239890c5c63c2e058fe9d7dfddcd36e25ca221

PR opened by Vaaankas at 2024-03-15 17:12:35 UTC


PR changed 84 files with 166 additions and 0 deletions.

The PR had the following labels:

  • No C#
  • Changes: Sprites

Original Body

About the PR

Changed weapons to be equippable in the suit slot where they weren't for consistency.

Also copied visuals from the backpack and belt slots where appropriate to the suit slot.

Why / Balance

It makes it easier to recognize when someone is armed and looks cool with a lot of previously almost unused sprites being used.

A byproduct of #26116 discussion and feedback.

Technical details

Media

  • [+] I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Screenshot_27
Screenshot_26
Screenshot_25

Breaking changes

Changelog

🆑 vanx

  • tweak: You can now wear most guns in the suit slot, and see them on yourself!

@SimpleStation14 SimpleStation14 added the Pull Request Mirror Mirrors a PR from another Repo. Automatically applied by mirror bot label Apr 22, 2024
Copy link
Contributor

RSI Diff Bot; head commit 48b5606 merging into 3bf08c7
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Battery/disabler.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Battery/taser.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Revolvers/chimp.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Revolvers/deckard.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Shotguns/hm_pistol.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi

State Old New Status
equipped-SUITSTORAGE Added

Copy link
Contributor

@DangerRevolution DangerRevolution left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

needs to be carried over to Delta weapons

@SimpleStation14 SimpleStation14 marked this pull request as draft May 4, 2024 21:12
@VMSolidus VMSolidus marked this pull request as ready for review May 12, 2024 03:33
@VMSolidus
Copy link
Member

needs to be carried over to Delta weapons

We can make that happen in a separate PR

@DangerRevolution DangerRevolution merged commit 07c5a40 into Simple-Station:master May 13, 2024
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Pull Request Mirror Mirrors a PR from another Repo. Automatically applied by mirror bot
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants